From 2d29c4a43fbdab4d9fcae2589cf729b2dd1c3783 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 1 May 2013 16:40:13 +0200 Subject: [PATCH] window: last size is more important than default size reorder size computation code to reflect that. https://bugzilla.gnome.org/show_bug.cgi?id=696882 --- gtk/gtkwindow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index d509920c68..16942b8ab3 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -7838,9 +7838,6 @@ gtk_window_compute_configure_request_size (GtkWindow *window, info = gtk_window_get_geometry_info (window, FALSE); gtk_window_guess_default_size (window, width, height); - gtk_window_get_remembered_size (window, &w, &h); - *width = MAX (*width, w); - *height = MAX (*height, h); /* If window is empty so requests 0, default to random nonzero size */ if (*width == 0 && *height == 0) @@ -7850,7 +7847,6 @@ gtk_window_compute_configure_request_size (GtkWindow *window, } /* Override with default size */ - if (info) { if (info->default_width > 0) @@ -7864,6 +7860,11 @@ gtk_window_compute_configure_request_size (GtkWindow *window, info->default_height > 0 ? height : NULL); } + /* Override with last size of this window */ + gtk_window_get_remembered_size (window, &w, &h); + *width = MAX (*width, w); + *height = MAX (*height, h); + /* Override any size with gtk_window_resize() values */ if (info) { -- 2.30.2